Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 21 Jan 2010 09:12:33 +0000 (09:12 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 21 Jan 2010 09:12:33 +0000 (09:12 +0000)

Trivial merge